bitkeeper revision 1.1389.18.1 (428289b8KkAz82ikwIly2BN9DLZJJw)

Fix xen0 kernel to run in unprivileged domains by disabling ACPI.

Signed-off-by: mark.williamson@cl.cam.ac.uk

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
index 2d385c1c092e7558e4c420b9c7e3b813c56bc152..ef7572baf6131b7be89efa244b5adf0088a09afb 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1566,12 +1566,19 @@ void __init setup_arch(char **cmdline_p)
        if (efi_enabled)
                efi_map_memmap();
 
-       /*
-        * Parse the ACPI tables for possible boot-time SMP configuration.
-        */
-       acpi_boot_table_init();
-       acpi_boot_init();
+       if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
+       {
+            printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
+            acpi_disabled = 1;
+             acpi_ht = 0;
+       }
 
+       /*
+        * Parse the ACPI tables for possible boot-time SMP configuration.
+        */          
+        acpi_boot_table_init();
+        acpi_boot_init();
+            
 #ifdef CONFIG_X86_LOCAL_APIC
        if (smp_found_config)
                get_smp_config();